Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mixology: choose direct ref deps when merging #5654

Merged
merged 2 commits into from
May 22, 2022
Merged

mixology: choose direct ref deps when merging #5654

merged 2 commits into from
May 22, 2022

Conversation

abn
Copy link
Member

@abn abn commented May 20, 2022

No description provided.

@abn abn requested a review from a team May 20, 2022 19:48
@abn abn marked this pull request as ready for review May 20, 2022 19:49
@abn abn force-pushed the fix-poetry-core-110b1-compat branch from a20e333 to 8223e9b Compare May 20, 2022 19:51
@abn abn mentioned this pull request May 20, 2022
Merged
Secrus
Secrus previously approved these changes May 21, 2022
View reviewed changes
@Secrus Secrus requested a review from a team May 21, 2022 13:53
radoering
radoering previously requested changes May 21, 2022
View reviewed changes
src/poetry/mixology/term.py Outdated Show resolved Hide resolved
src/poetry/mixology/term.py Outdated Show resolved Hide resolved
src/poetry/mixology/term.py Outdated Show resolved Hide resolved
@dimbleby dimbleby mentioned this pull request May 21, 2022
Merged
@dimbleby
Copy link
Contributor

It's a bit unfortunate that it's possible to make commits here that break things when run against the latest poetry-core.

Perhaps, just as poetry-core has pipelines that run against latest poetry, poetry should have pipelines that run against the latest poetry-core.

Or perhaps this doesn't happen very often and that's just not worthwhile

@radoering radoering mentioned this pull request May 21, 2022
Merged
@abn abn force-pushed the fix-poetry-core-110b1-compat branch from 8223e9b to aa958ba Compare May 21, 2022 21:34
@abn abn requested a review from radoering May 21, 2022 21:36
@abn abn force-pushed the fix-poetry-core-110b1-compat branch 2 times, most recently from b378d3e to aa958ba Compare May 21, 2022 22:41
abn
abn commented May 21, 2022
View reviewed changes
src/poetry/mixology/term.py Outdated Show resolved Hide resolved
@abn abn dismissed radoering’s stale review May 21, 2022 23:22

Changes applied.

@radoering radoering merged commit ed7eac3 into python-poetry:master May 22, 2022
@radoering
Copy link
Member

@dimbleby Not sure if it's worth. In some cases it is useful. In other cases it complicates making tests forward compatible. At least, when applying the method that is favoured at the moment as in:

poetry/tests/puzzle/test_solver.py

Lines 1387 to 1390 in ed7eac3

if is_poetry_core_1_1_0a7_compat:
pypi, git = complete_package.all_requires
else:
git, pypi = complete_package.all_requires

That would require a version bump in core and a new compat variable for each such change. On the other side that may even be cleaner than now and we could use .dev or .post versions for that.

@kasteph kasteph mentioned this pull request May 30, 2022
Merged
@github-actions GitHub Actions
Copy link

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 29, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@radoering radoering radoering approved these changes

@Secrus Secrus Secrus left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@abn @dimbleby @radoering @Secrus